Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add bootc to Bluefin #1285

Merged
merged 30 commits into from
Jun 23, 2024
Merged

feat: add bootc to Bluefin #1285

merged 30 commits into from
Jun 23, 2024

Conversation

noelmiller
Copy link
Member

@noelmiller noelmiller commented May 10, 2024

Upstream Issue

ublue-os/main#572

Purpose

We would like to test adding bootc to bluefin before adding it to main. Ideally, we should be able to test it here and then implement in main.

Things that need to change before merging

  • Putting booupctl command before initramfs step to see if it needs to be run before or after. This will help determine where this command needs to run (either in main or in the downstream)
  • Remove sl package
  • Test enough to get a release of build-container-installer so we aren't using the main branch

@noelmiller noelmiller changed the title Add Bootc to Bluefin feat: add bootc to Bluefin May 10, 2024
@noelmiller
Copy link
Member Author

@m2Giles feel free to work from this PR to get this merged into Bluefin.

@m2Giles
Copy link
Member

m2Giles commented May 11, 2024

With the iso justfiles merged, we should be able to iterate this quickly. Will look at this later.

@m2Giles
Copy link
Member

m2Giles commented May 11, 2024

Moving the bootupctl command before the initramfs generation worked.

@m2Giles
Copy link
Member

m2Giles commented May 11, 2024

Note: using testing branch for the better brew install as well. Bootc is waiting on an update to the GitHub action

@m2Giles
Copy link
Member

m2Giles commented May 12, 2024

Probably should of just rebased to before the brew stuff. But it's all removed.

This merge is currently waiting on a pinned release of the container build installer action.

@gallium-stanza
Copy link

gallium-stanza commented May 12, 2024

bootc install requires gdisk which is not available in the image,
I tested installing on my machine with tpm2 encryption on, it worked beautifully: sudo podman run --rm --privileged --pid=host -v /var/lib/containers:/var/lib/containers -v /dev:/dev --security-opt label=type:unconfined_t ghcr.io/gallium-stanza/bluefin:40-testing-20240511 /bin/bash -c 'rpm-ostree install gdisk --apply-live && bootc install to-disk /dev/nvme0n1 --wipe --filesystem=btrfs --block-setup=tpm2-luks'

then I rebased to ghcr.io/ublue-os/bluefin:latest and added a recovery key for luks2 partition, just to be on the safe side.

@m2Giles
Copy link
Member

m2Giles commented May 13, 2024

I just realized I've only tested 40 images since we added the bootc.sh.

Need to make sure it doesn't negatively effect 39 images.

@castrojo
Copy link
Member

Ok so should I add gdisk in a separate PR?

@m2Giles
Copy link
Member

m2Giles commented May 16, 2024

I think that is for the install to disk option of bootc.

Kinda like the coreOS installer command

@m2Giles
Copy link
Member

m2Giles commented May 16, 2024

It looks like 39 doesn't like the bootupctl command at all.

image

@geoffreysmith
Copy link

geoffreysmith commented Jun 6, 2024

Do we have a slimmed down testing image for things like this (https://github.com/rust-vmm/rust-vmm-container/blob/main/Dockerfile)?) I am literally working on bootc testing because virt-vmm supposedly supports natively connecting to guest VMs, and supports booting directly from images. I guess just the fedora-bootc:41 ... maybe with nvidia because intercepts some things but I was hoping something lightweight. Their repo is like all over the place, I'm guessing this (https://gitlab.com/fedora/bootc/base-images-experimental/-/blob/main/Containerfile?ref_type=heads) but the containerfile is hardcoded to 40? Ignore my virt-vmm is there anything you're using or I'm missing to do some smoke tests?

@m2Giles m2Giles marked this pull request as ready for review June 22, 2024 23:08
@m2Giles m2Giles requested a review from castrojo as a code owner June 22, 2024 23:08
build_files/base/bootc.sh Outdated Show resolved Hide resolved
p5
p5 previously approved these changes Jun 22, 2024
Copy link
Member

@p5 p5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! LGTM!
And sorry if it seemed like I was nit-picking

@m2Giles m2Giles enabled auto-merge June 22, 2024 23:21
@m2Giles
Copy link
Member

m2Giles commented Jun 22, 2024

Thanks! LGTM! And sorry if it seemed like I was nit-picking

Nope. This was weird where I had another branch where I was doing changes as well and some cleanup was missing. This is why we review!

@m2Giles m2Giles added this pull request to the merge queue Jun 23, 2024
Merged via the queue into main with commit 05a262a Jun 23, 2024
55 of 60 checks passed
@m2Giles m2Giles deleted the testing branch June 23, 2024 01:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants